bitkeeper revision 1.1159.136.1 (4180f22b7w-EU80mOd3abiYrtdoUAA)

build cciss by default, don't build nbd

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 142cd3bd4e1c4bfd899759c232718ac1d39a5e03..e0c4c689fb5d2b6264a517d4fa4149c1721c228f 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -50,3 +50,31 @@ xen/tools/figlet/figlet
 xen/xen
 xen/xen-syms
 xen/xen.*
+docs/interface/WARNINGS
+docs/interface/images.pl
+docs/interface/images.tex
+docs/interface/img1.png
+docs/interface/index.html
+docs/interface/interface.css
+docs/interface/interface.html
+docs/interface/labels.pl
+docs/user/WARNINGS
+docs/user/images.pl
+docs/user/images.tex
+docs/user/img1.png
+docs/user/img2.png
+docs/user/img3.png
+docs/user/index.html
+docs/user/internals.pl
+docs/user/labels.pl
+docs/user/user.css
+docs/user/user.html
+docs/xend/WARNINGS
+docs/xend/images.pl
+docs/xend/images.tex
+docs/xend/img1.png
+docs/xend/index.html
+docs/xend/internals.pl
+docs/xend/labels.pl
+docs/xend/xend.css
+docs/xend/xend.html

diff --git a/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig
index 42aeb485be1fec409670a43f7ac1f68f81eb6fc3..63f0dbb80f46f3ffb3a7e61160c62ecff473b99b 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig
+++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig
@@ -202,12 +202,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_XD is not set
 # CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
+CONFIG_BLK_CPQ_CISS_DA=y
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=y
+# CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096